Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/autoload.el
index d9a43c23299e8f7fdd6d6190dc1ef1c94d5c0750,ede4edcd57e5d88ed246e6c32361f8dc79605c1d..d9da36586ceb114f838d77001b4e609fabc470ad
--- 1/lisp/emacs-lisp/autoload.el
--- 2/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@@ -1047,9 -1045,9 +1047,9 @@@ write its autoloads into the specified 
                         ;; we don't want to depend on whether Emacs was
                         ;; built with or without modules support, nor
                         ;; what is the suffix for the underlying OS.
 -                     (unless (string-match "\\.\\(elc\\|so\\|dll\\)" suf)
 +                     (unless (string-match "\\.\\(elc\\|eln\\|so\\|dll\\)" suf)
                           (push suf tmp)))
-                      (concat "^[^=.].*" (regexp-opt tmp t) "\\'")))
+                      (concat "\\`[^=.].*" (regexp-opt tmp t) "\\'")))
         (files (apply #'nconc
                       (mapcar (lambda (dir)
                                 (directory-files (expand-file-name dir)

diff --cc lisp/help-fns.el
Simple merge